Fix ERC bug introduced in last patch

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-387
Creator:  Michael Olson <mwolson@gnu.org>

diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index cd5b825b71e16a46f2e6a0daef76feded8bd57d5..b495eda20f1deb4e49885b40c99ebb28cf6051f6 100644 (file)
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -2,6 +2,7 @@
 
        * erc.el (erc-arrange-session-in-multiple-windows): Fix bug with
        multi-tty Emacs.
+       (erc-select-startup-file): Fix bug introduced by recent change.
 
 2006-08-05  Michael Olson  <mwolson@gnu.org>
 

diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index bd31ee3d3b7913e903b4906045b3adc131b14973..726d02ed613a4923c1301a856f25dc4569ae4a13 100644 (file)
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -5244,7 +5244,7 @@ If FILE is found, return the path to it."
 See also `erc-startup-file-list'."
   (catch 'found
     (dolist (f erc-startup-file-list)
-      (setq f (convert-standard-file-name f))
+      (setq f (convert-standard-filename f))
       (when (file-readable-p f)
        (throw 'found f)))))